Making some refactoring changes