Refactored validation to flag each field and be a better class in general