Fixing two docstrings and renaming Classes for PEP8