#21 minor refactoring