Minor indentation correction
Drastically reducing likelihood of actor name collisions, and handling them better