Clean even more the User class