code cleanup
highlight when hovering