Refactored return statement