Refactor models modules.

Use list comprehensions instead of for loops for pretties.