Cleanup

Cleaning up codebase