Adding some flake8 suggestions in.

Ignoring the fact that it tells me tabs suck, I like tabs.