basic refactoring
Merge pull request #81 from alangster/comments

basic refactoring