pep8 + removed unneeded classes