numerous style fixes