Just small refactoring...