cleaned up time keys