Minor refactoring...