refactoring configvalidator
resolved conflict