Fix/simplify time format helper

Closes #21