Doing some cleanups
Cleanups 2