Reorganize and pass pylint
More pylint changes
More pylint fixes...