Fixed to only use nucleotide database and cleaned up code.