Code refactoring & typos (#2334)

5 jobs for v2.0 in 19 minutes and 24 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Build
passed #34377
build_bionic

00:03:55

passed #34376
build_buster

00:02:55

passed #34378
build_centos_7

00:05:32

passed #34379
build_centos_8

00:03:12

passed #34375
build_stretch

00:03:48