Some code fixes
Remove redundant escapes
Merge pull request #682 from Sannis/code_cleanup

Code cleanup