First pass at fixing time formatting'