Fix/simplify time format helper