Refactoring, refactoring, refactoring *steeve ballmer style*