refactor elrang mode

Change-Id: I0de57e3db60b96c92914a4cb4299af4e98889af4