Use extended regular expressing syntax here to clean up a bit. I'll submit a pull.