Transition to Stroustrup style