Address #1; disable header comment check; grammar :)