refactor actor module part 3