codegen breathing again
Some cleanup
codegen progressing