MVP-240 Cleanup and better validator documentation