This fixes up most of inconsistencies related to pylint runs in
  order to clean up and make test pass (mostly)