Some formatting and style fixes.