fix suggestions in gerrit review: https://galileo.mailstation.de/gerrit/#/c/2113/