Clean up Validator and Mail components

- Fixed docblocks
- Removed some unnecessary returns
Merge branch '4.0'