Minor cleanups
Refactoring acl stuff for cllctr