Several small whitespace fixes for styleguide/flake8 violations