Re-indent to keep start on same line
Move arguments to the next line
pep8 cleanup to fix comments from abadger