Refactor some methods in models

Refactor some methods to use more idiomatic code =D