Just some refactoring.