Making pylint a bit happier: alignment, line wrapping and removed unused import