Cleaned up the code
Cleaned up commit model