Reformat merge

Rest of the reformatting and your latest changes merged in.