Tidy up long lines

Change-Id: I22d90a343c351b90f460b8810bfb4bd28dc0792d