Remove trailing whitespace
Fix the regex so that the time works.