Minor style tweaks and checkpoint commit