Clean up, align on AHC2