addressing feedback given in gerrit https://gerrit.wikimedia.org/r/#/c/59405/1