cleaned up users model a bit