SC-40 Intermediate refactorings