Refactor, move client time normalization into this module