Use super() correctly
Adjust comment
Remove unused imports