Minor refactoring

Change-Id: I20cb2ba82bf74c1b8e54a97b5238b5d42c4d7c2c