More special characters
Refactor and minor stylistic improvements