cosmetic fixes and minor cleanups