Make User class more DRY