Updating user model formatting + more comments