Cleanup code

Revmoved lots of trailing spaces, etc.

Change-Id: I5adee31b96a8c4b1375d93d386abde8e5f15f184
17 files changed