More trailing spaces removed
Remove comments saying who changed a line

Git is so much better at tracking changes than we mere mortals.
Format alarm section cleanly.

Indents are 4, not some random number.