pylint cleaning - phase 1