Improves readability and adds links