Litle refactory