Small refactorings requested by code review