User

Cleanup code

See diff & comments