Remove duplicated codde and add more links