All todo done and refactoring in the text done