Refactored Controllers to be more readable.