Add comments for refactoring to better code

Try refactor the line where i add "# toDo" sections.