cleaned todo