Fixed bad import
Refactored validators to extract methods/functions.