cleaned up regex slightly