Various spacing improvements

Change-Id: Iad5a9ce360eca59a3ad401c72de774c97415abff