manual merge of 'refactoring for style'-items