Cleans up from #47.
Merge pull request #49 from AshFurrow/models

@1aurabrown => Cleans up from #47.