No reason, except that I hadn't refactored yet, after adding the new functionality.

Restructuring done, but need a little more to make it nice.