Rename subscriber, break logic into smaller methods