Refactored Dna
Refactored Dna and tests