Improve topology output format