massive reformat, rearrange, optimize imports. no substantive change.