organize clock in a nicer way