jfltevzw: little cleanup