Comment tweaks and some minor code re-ordering.