Build #271:   more refactoring on branch feature/more-refactoring over 8 years ago