time.c separated & clean ups
merge