Reformat. Fix headguard name. Clean up.