renaming and minor cleanups