Simplify return logic