Changed names and extracted InputValidation.