Address review comments

Will be squashed before final commit