Style refactoring

Change-Id: Ie559d1bca6fb1715e2fce0dd0d0639120d0f29aa