@LudwigOrtmann fixing coding style violations should be not part of this PR