Worked on some time formatting