fix highlighting; clean up