cleaned up parser code
parser and task 1