Fix code gen
MORE TEST CASES
Add support for dashed identifiers
Phew
MORE
REFACTOR
Refactor