Refactoring of User.java #59 #60