Cleaned up the code, added validation to the user model name