Initial refactorizations