Refactored return value