Change multiplication symbol from star to times
Fix long lines

Change-Id: I21c3d7cbab96f593994caa0265af97779441511b