Cleanup - constructor name didn't match file name.