more consistency, style fixes