Dave Hoover

Results 3 issues of Dave Hoover

Putting the more performant boolean check first.