actor: code cleanup