Several formatting fixes.