Fixed validations
Added Scopes to models and removed whitespaces