clean up refactoring