Tweak comment and re-order method defs