[SQUASH ME] addressed comments by @LudwigOrtmann