Code cleanup - codegen.py: reorder top level items.
Code cleanup - codegen.py: remove some debugging comment outs.
Code cleanup - codegen.py: Rename and reorder class members.