Clean up spelling and unused import