Some code fixes
Remove redundant escapes