Added more style fixes.