Refactor by popularity method into scope