Mild refactoring on Users model.