SC-43 Minor refactorings