refactoring(active users, companies)