Clean up line splicing and indentation

Change-Id: I2b9725052aeaeebef84ec9aedba639f6dda537ff