Minor refactoring

Change-Id: I57198890b5fd833ba0f3368197d074a5fdc1d3e1
1 file changed