Rework code to conform better to "pylint" default guidelines