Removed redundant TODO.
Make the code more re-factorable by generating the class names, rather
than hard-coding them.