cleanup/better hover