Clear whitespaces and fix typos

Change-Id: I39e4ab4c875b0a3cf989f2a7b92de613baf08752