A bit more cleanup in User class.