Comment and minor changes to pass pylint.