[cl-weblocks-ticket] Re: #33: Refactor, document, and unit test overly complex functions