misc. refactoring
cleanup