More return cleanup