more refactorings in User.role -> User.roles