controller cleanup
cleanup refactoring