cleanup to match master on if statement