Yes, good point about the refactoring.