Minor tweaks and formatting

Change-Id: I1c50348115ce99e64f97f8c856d37deddb101a99