minor unrelated cleanups