clean spacing in conditionals

Change-Id: I11ebc9052429f0e5e292a3b43d0cc43af3b364c0