Some refactoring to support old C format. (Some old C compilers)