Still has design elements that make it less testable than it could be;
however, those shall remain for the benefit of the lesson on design
for testability.

There are still design issues (most of which we won't fix because they
serve the assignment), but the code is now more readable.

This code has bugs that are outside the scope of the assignment.