Refactoring.

Moved the let-expression closer to dolist in the hopes that
it will make the code slightly easier to read.