Refactored model class
Merge pull request #7 from rhapsodyjs/refactor-model-class

Refactored model class