minor internal cleanup