remove some clutter
fix wrong highlighting
default highlighting didn't work for these cases, for some reason