Refactor from using this to Jigsaw variable