Clean up

Removed unnecessary square brackets, plus symbols and made most of the groups non-matching groups. Don't blame me if it breaks things, cause I haven't tested it.