More formatting fixes, more methods moved to UserManagement classes.