Refactor isotope cluster and it's test program