Starting to clean up some of the shapes

General / 21 March 2019