Some code formatting and remove unused import.