Cleanup variables and whitespace

Change-Id: Ic34dc815b2f42a2e0a97f5381f584b8845a66dd4