Unrelated, seems like this should be a new issue on refactoring.