Remove unused imports and split long lines modified