Also, if you're interested in having the code from your answer reviewed, we have a bit of a friendly competition going on. – ckuhn203 14 mins ago
I'd be interested, but the asker has circumstances where they have to do the refactoring as an assignment, so I'd hate to make them look like a plagarismistist (or however you call that). Is there some way I can enter and polish my code without doing that on the specific question?