code cleanup and added name to mouseover popup