Better renaming
Removed an unused import.