minor (and partial) C code reformatting, cleanup