#119 minor refactoring