Apply suggestions from code review

Commit

5 years ago

Apply suggestions from code review Co-authored-by: Marc van Zee <marcvanzee@gmail.com>