code refeactoring, introducing interfaces and abstracts for validators, locators and services