Cleaning up actor a bit.