Tweak comments
Re-order args