Expression visitor implemented cleaned up parser package