UC-136 responding to code review feedback and breaking apart a large function