Improve formatting, links