Removing unused import
Fixing up some whitespace