misc refactor / cleanup
more