Cosmetic changes. Fixed match group bugginess.