Refactor Parser for Type and Statement