changing to cpp style