further refactoring cleanup