Cleanup of code
Adding comments to describe classes and methods