simplified the regex stuff
I think I fixed it