Fixing up and cleaning up