TODO comments management