Improved MT formatting a bit