bugfix for 10472

and some whitespace to follow code guidelines

last one I hope