Refactor parser
Simple merge