refactored isotope services