Clean-up to deal with pylint complaints (mostly long lines)