Add Name to User object
Formatting and minor behavioral changes