Minor cleanup to action selection