syntax and style fixes