Code review responses (to be squashed)