Apply suggestions from code review

Commit

2 years ago

Apply suggestions from code review Co-authored-by: lewtun <lewis.c.tunstall@gmail.com>