Improved formatting, links