See last commit, this just uses less regex

Less RegEx in the "ClockFormat" class and a slightly more robust way of
handling it.