Refactoring Actor a bit more