First modifications to the C source code, mostly cosmetic