Refactor if statement to early return

This eliminates the protracted if statement and aligns the code body.
delete parenthesis
Land #3750, @wvu favoring unless