Improve structure of outputted source info.