Made several style fixes.