More refactoring
Further refactoring of actors.