Refactored out 'if block' into just one return statement