More refactoring cleanup