Fixed style issues

Change-Id: I80240c359124abc9d34cfa4d4a3e53ea3f7dd876