some refactor in stock services #2