Refactor model
Merge pull request #7 from ruby-journal/feature-5

Refactor model