Cleared up regex a little