Applying little fixes and PEP8 to make travis green

This will cause a PEP8 error, make sure your editor feeds a newline when you save.