Quote cleanup
Bracket cleanup