More use of regexp