Start refactoring client