move validators to a more appropriate place