Remove unused import.
Replace to Option.
Refactoring.