timespan regex refactored

refactored regex, location of the expression variable and application of
the expression