Cleaning up work
Done cleaning up the various parts