hendrikboom3 Some code cleanup without substantice changes.