Little refactioring