Removing some whitespace and changing some text

Change-Id: If902a53476b2e5c39d20fd6e6b9f31b9bd6c9a9a