Refactoring/popover