Format corrections
Some more improvements