Rename XXX comments with TODO:

Picks these up in `rake notes` and adds semantic meaning
Line is too long. [85/80]