Final small refactoring