Some more style changes.