Touchups to c mode with stroustrup style