Clean up return statements