Yes, I'm glad that you agree and that this refactoring finally hit the top of the priority list.