Refactor TimeConversion class