KAZOO-1092: fix validator
KAZOO-1092: formatting