refactoring(users & companies block)