minor cleanups
minor cleanups