Small changes at the actors

a little code clean up