Clean up stray spaces
Fix code formatting

It’s really hard to see what belongs with what when the tags aren’t
lined up