That was a great example how to do do real-world "refactoring" :-)