[#1140] More pep8 cleanup, in order to make tests succeed again