Commit 6d2a6f3e06a2d0468c89ed4c2efced58434a8735

Edward Thomson 2021-06-15T00:22:30

Apply suggestions from code review