cleaning up code and sorting out SVGs