clean up/refactor