Added some formatting and linking