Aesthetic tweaks
Everybody stand back. I know regular expressions.