Improve TODOs

This change improves the contents of TODOs in the code so that Rubocop
is satisfied.