Added users validation and removen unecessary comments