Refactoring for model classes

resolves issue #2