refactor comment model and fix untracked files

Hi guys

I re-factored the comment model also I ran `git rm . --cached` to get rid of the cached files.

just a suggestion if we are looking at long term, we might as well start writing tests for whatever code modify or add.