Formatting for line length and indention

Change-Id: I21d93cb0cb0b9d7f1e34ff9c6c873c469793d9e8
Reviewed-on: https://gerrit.wikimedia.org/r/127405
Reviewed-by: Chad <chadh@wikimedia.org>
Tested-by: Chad <chadh@wikimedia.org>