actortracker module, minor refactoring