Still more fixes in formatting