Improve pseud-visual highlight
Add comments