Adding repeat, cleaning/alphabetizing code