Re-arrange stlye

Change-Id: I1a44ef03d722560aa2818e315d7e455c561eed0b