cleaning up the controller and controller spec