Small fixes: line length and unused imports