+ fix. +minor refactor

Change-Id: I66c989b861ebd670e482fca4fccef9728d02acd8