Implement suggestions from PR 10

[#80581338]