This is a pure identity cleanup:

 - coding style fixes (whitespace, code, comment, line length cleanups)
 - remove dead code
 - simplify constructs, make code more readable