cosmetic changes to user model code