Updated and cleaned links