C style updates