Minor refactorings during review