fix broken links & reduce redundancy