Refactor if statement to early return

This eliminates the protracted if statement.

Argue the pros and cons of returning early elsewhere! :)