- solving all low hanging fruits from syntax to smaller refactoring
issues
- adding several ToDos (#4331, #4332, #4333) for greater changes due to
missing information or understanding what the expected solution should
exactly look like.
Issue-Ref: 4310
Issue-Url: af3#4310


Signed-off-by: Konstantin Blaschke <blaschke@fortiss.org>