Further work on minor refactorings