Fix flake errors

Hi. This pull request fixes the flake errors reported in the Travis Tox test (leading space in comments, line length, 'x not in y') so that the build passes.