Wording correct and remove the todo section