Modified class docstring and removed some unnecessary code