Clean up UserProfileController code