Clean up Validator and Mail components

- Fixed docblocks
- Removed some unnecessary returns
Merge pull request #2426 from DriesForks/dv/clean-up-validator-folder

Clean up Validator and Mail components