Remove unused import statement
Reformat whitespace and comments