litle refactor