cleaning up parser