refactoring

for each desired change, make the change easy (warning: this may be hard), then make the easy change. Kent Beck