[SQUASH ME] address more comments of @LudwigOrtmann