Step 2. Remove as many as possbile of the differences between the two classes. This is mostly whitespace and irrelevant code formatting issues, but there are also a few changes to the generated output, taking the best of both views.