🩹 Apply suggestions related to mr 544

This applies a bunch of suggestions from !544 (merged)

• !544 (comment 1283337146)
• !544 (comment 1283229855)
• !544 (comment 1282323307)
• !544 (comment 1283338685)
• !544 (comment 1282323235)

The comments about the use of erase will be addressed in #196 (closed) since the code has changed.