litle refactoring