Doing some refactoring.