Cleaned up controller and view