code cleanup for models
Merge pull request #2 from ceimox/jvargas/clean_up_models

code cleanup for models