Improve TODO to lower the barrier to entry