refactored goal tool service