Standardize formatting.  Add missing headers