Little refactoring...