Plenty of little corrections

No major change, just style adjustments