Minor cleanup in tpf
uvio