clean up/refactor various