style reformat and minor cleanups