First pass for style fixes