cleaned up some times