Small refactoring and a new todo