Refactor validations
Updating README.md