controller cleanup and comments