Clean up duplicate text, add comments