Refactor Numericality Validator