Clean up formatting, make line < 80 characters in length (well, nearly all)
Add in header protection