cleanup and update todo