actor refactor