Old comment is old.
Make those const.
Re-order some stuff.