Small refactoring...