Syntax cleanup....

Change-Id: I82c7cb9a6b4abccf95be664033a7222dbe365014