Tweak delimiting
Fix notation