Comments, nitpicking, refactoring & restructuring.

Almost exclusively nitpicking.