Refactor settings

Signed-off-by: gaoxuesx <xuesongx.gao@intel.com>