Agreed, but I wanted to make the diff as obvious as possible and without any refactoring, hence kept the code in the same place.