improve validators