Improve flow of conditions

This seems easier to understand.