c++ style fixes