Broken commit for checking why we are not passing test cases with this refactoring :)