Some more formating corrections

More formating fixes... hard to make it right when I am used to use
different formatting ;)