Updates after feedback on PR.