controller cleanup
controller spec refactoring