Add company and refactoring
more code