Small cleanup to actions