Address 'parse recovery warning' but saw an opportunity to speed up the code and render it more concise.