cleanup and fixes thanks to PyChecker
bundle pychecker