refactor actor module part 2