more code style consistency fixes and marking up of LegacyValidator issue