explanatory notes and stylistic cleanup in user model