Tidying up regex