style fixes to get lines under 80 chars