commit 3def3dae10ef8916f76649e90dc9acc0ca471a92
Author: Joachim Metz <joachim.metz@gmail.com>
Date:   Thu May 13 07:08:35 2021 +0200

    Code clean up
