#25 minor refactorings