Subscriber refactor (clean up)