minor cleanups
minor changes