Clean whitespacing

Change-Id: Ic28acc1cb9cba638f44385c0d19b068a74714798