Further refactoring cleanup