Syntax cleanup

Change-Id: Idf6eb30ffbf4f764322200f2a43a4cee4c2e2d7a
Merge "Syntax cleanup"