refactor users controller to set roles, also fix indentation for private...

Line is too long. [134/100]