Initial refactorings