Doing some clean up
Clean up