potential fix for failing travis tests

- some unrelated white space fixup
- looks to me like the reliance on a global var might be confusing travis, if this goes green then I'm right!