regexp changes

simplifying regexp stuff