Minor cleanup after refactoring