modifications by pychecker