Final style fixes.