Address review comments

Authored by dfaure on May 20 2020, 9:48 PM.