Cleans up return handling