SC-12 Minor refactorings