Comments from philipp paul köhler (@phlppk)