Re-factored TeX commands