Fix white space
Remove unused imports