SC-67 Refactorings