Personally I prefer the existing hanging style of indentation as it doesn't require breaking things up into so many short lines, however, neither the existing style nor what you've changed it to should throw a flake8 error -- does it for you? We've finished the flake8 cleanup so there shouldn't be any existing errors now.