I think it makes the code more readable to have the short case first, we should keep it as is.