Moving feature detection to a higher scope. Reducing the if conditions s...

...lightly.