cleanups
Refactored: based on 'Fat model Skinny controller' :neckbeard: