This is a repeating pattern in your change. I don't want to clutter the PR with the same comment. Can you address them all?