Added some comments, changed a class name