improvements for better readibilty and simpler code. Referring to ticket #612
Authored by: raph-z 2021-08-11
Parent: [r947]
Child: [r949]