refactoring cleanups