Comment: Todo refactor