Cleanup spacing from long ago, seems some sections have been cut and