Clean up return logic