Implemented cleaner hyperlinks