minor refactoring #24