Addressing review feedback (to be squashed)