Clean up
Add package for escaping string literals
Temp