Remove comment cruft
Refactor file state
Return imports and exports from parser