clean up and refactoring in prep for newick tree tests