Little refactor..