Simplify and fix highlighting