cleaned up the todo