Replace "popular" action with refactoring