@dieterc can you set up your editor so that indentation uses 4 instead of 2 spaces and fix that throughout this PR?