refactoring the parser
TODO: add the imports into a test case