todos: Some todos reorganization