Address pylint errors and include changes from column-width PR