refactored parser class
parser class refactored