refactoring
removing unneeded messages
Merge pull request #7 from glennblock/master

Refactoring into separate files