more concise style in marker comment definition
spacing fix
tighten up multiple comment matching