Apply suggestions from code review

Commit

53 days ago

Apply suggestions from code review Co-authored-by: Matthew Hodgson <matthew@arasphere.net>