style tweaks, remove first-match