Little refactoring :)