Fixed style issues

Change-Id: I422d0fc5085404a2922d20b34518e136e1e27767