Refactoring popup.