cleaned up regex