Cleaned User.java