Code styling and remove spaces

Change-Id: I75b70c046f69ee5ccce8a5aea5d1db0d3548e206
7 files changed