minor cleanups all around