Handle escapes more elegantly. Clean up. Closes #8.