service refactoring - step 2