cleaned up regex a touch