Code Review

Remove unused import
Use modern syntax