Refine regex some more