Removed restructuring for return value