[ros-diffs] [sserapion] 36260: Tidy up code a bit