Refs #20 Refactoring in Parser