Refactor into company service