Small logic reorder
less if's, more performance