cleaned up controller and view even further