Cleanup

Cleaning up the code!