couple of trivial cleanups