In the 3GS, the display assembly was easy to take out, but the battery was a pain. In the 4 and 4S, the display assembly took 38 steps to remove, while the battery was a breeze. We like to think that Apple has started tailoring to our preferences in allowing us to remove both the display assembly and the battery in only a couple of steps.