Rename the labels.  Remove a #define
Change a method signature
Add a #define, remove unnecessary code