Regex improvement

- old regex replaces on POSIX bracket classes