Clean up decorations and whitespace around header guards