Yes, you're right. It's already done in a few of the if statements - might be able to move it so it happens even less often