Fixed wrong named class
Fixed some pep8 warnings
Removed unused imports