Refactor: actors and world