Code Cleanup
Incremental Commit