cleanup refactorings