clean up/refactoring