Small cleanup after last refactoring