Refactored code. Trimming down controllers.