Small formatting changes; the first round of tests for the formatted version  through PyCharm seems to have gone through without damage…