Added spaces before and removed spaces after 'array'

Fix some other spacing while at it

Change-Id: I13f81533eaf40e06c13cf377c0f08ef5cef01d00
Merge "Added spaces before and removed spaces after 'array'"