Code cleanup

Fixup whitespace

Change-Id: I4b9d24d07f714f582aea640f129fd7ed3e5ea6da