pep8ify and fix typo of classname