Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Kim Thoenen <a6312121e15caec74845b7ba5af23330d52d4ac0@smuzey.ch>
Co-authored-by: Raphael Das Gupta <c2208abde9668e8e9815c3690855edd1e63abeac@raphael.dasgupta.ch>
willmcgugan/rich