move above to helper method and clean up the controller?