Refactoring StuffService