General formatting fixes.