Address the feedback from @JacquesCarette in #134.
Address the feedback from @JacquesCarette in #134.