Address review comments.
Minor tidy up.