Fixing time formatting