cleaned up popover