spacing improvements

Change-Id: I6e7d1ea93904358fe03a4292b8c07f28d250d160