Committing after code clean up