This MR is mostly to propose changes to the edits performed by @mschleiss in #63 (closed).
As most edits were done in the main branch. The Merge Request serves only to add comments and make small edits