__future__ import fixes and whitespace
Fix the previous bugfix correctly