slight cleanup
adjust indentation
replaced some user attribute to adapt to the new data model
changed attribute of user object to adapt to the new data model
added some validators