New pass done for issue 119

- More characters esacped
- Better test
- Style improvments