CompanyAclService code optimisation