minor cleanups and coding style updates