whitespace, comment, and regex simplification