cleanups/ refactoring