Refactored a method to a more meaningful place

This deleted a few more classes and a "factory" class that wasn't even a
factory.
Updated comment
Adding TODOs