style changes from #493 raised by @stefan-schweiger