Refactor disallow comma