Refactoring of code, before adding new service