Wrap some long lines

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Wrap more long lines

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>