misc trivial lint cleanups