Refactor TE list (osx)