minor c++ style fixes