cleanup a few spaces

Change-Id: Ib994a10b3479e42726a22ce760ca83ef16396833