Cleanup some extra spaces

Change-Id: Ibb5d2c4cbf00e1afafb4e724c64a5eb4952dd762