C style cleanup.