Applying little fixes and PEP8 to make travis green