litle refactoring client