very minor cleanups