More cup cleanup to match internal styles