Reformat, correct docs, for legibility