Cleaned up the C generator's structure