Arrange todos and texts
Refactoring