Removed extra whitespace and unused import
Merged latest changes.