Hi @maru-sama can line 86/87 be refactored? Seems like double checking of the same thing.