Further small refactoring