Update links, reformat to match code