made some minor cleanups