Refactor some methods in models
Merge pull request #13 from jaimerson/random-refactors

Refactor some methods in models