Part 2.2: More code simplification