Re-align block of attributes

Change-Id: I98c719e208294b247f4d326a694d526266ad9d60