hltevzw: refactor more things

kang stuff from jfltevzw,
Merge pull request #1 from noobnl/cm-11.0

hltevzw: refactor more things