hltevzw: refactor more things

kang stuff from jfltevzw,