refactor user_id to cached subscriber_id, clean up comments