Removed blank lines and unnecessary semicolons to work around SDROM stack overflow issue

Change-Id: Iafd3dce51aa9ed98d2b94862cf3754da9b96fae3