Phase 2 - minor clean up to user class