code fixes and cleanup for Hover

Change-Id: I38b190289774c6ba7f70bc3e8eabc1bfedcf9a82