Continuing cleanup of parser