Completed refactoring ActorController and ActorService