Minor format adjustments

Change-Id: I020f407515a7b6d28c71e44e91ed56752bb49c22