Popover class and editor cleanup.