Ah ok, I'll refactor the if-then