Refactored DNA classed for speed