Start some refactoring.