SC-44 Minor refactorings