Minor refactoring.
Minor refactoring.
Clean up unused import.