Header cleanup and preliminary compartment boundary