Cleanup refactoring