Litle refactoring...