several style fixes