Small edits in user class