small refactoring (#3221)

11 jobs for master
in 27 minutes and 26 seconds, using 0 compute credits, and was queued for 2 seconds