Some clean up
Convert tabs to 4 spaces
Remove unused imports
Fix missing `super` call
Fix PEP8 issues.