pylint work, moving some definitions around.  #71