Remove return statements from procedural code