Model commenting and cleaning up
Merge branch 'master' of https://github.com/somanayr/LSP.git