Cool, just checked Pham's code metrics again,
~~~ Before Refactoring ~~~
Maintainability Index: 64
Cyclomatic Complexity: 1,300
Depth of Inheritance: 10
Class Coupling: 136
Lines of Code: 4,104
~~~ After Refactoring ~~~
Maintainability Index: 73
Cyclomatic Complexity: 1,038
Depth of Inheritance: 10
Class Coupling: 136
Lines of Code: 2,004