two cleanups in user model and show page