Clean-up formatting
Clean up formatting
Consistent [data, embedded, links] order in output