Refactoring cleanup