Update times correctly
Clean up