Refactor parser
Refactor assembler