minor refactoring. refs item: 995