Agreed. Let us leave the refactoring for later.