Cleaned up controller class