Making changes from @jcarouth's notes on the PR