Renaming class; cleaning up debug code.