Reformat whitespace, add titles