Cleanup

Cleaning up code