Code Cleanup

Cleaning up code