Fixed spacing and other typos

Change-Id: I2b261e951853b4850252544f765fbde7b6a1989d