Removed trailing spaces and unused imports