cleanup and adding times