Format fixes and note for notice preservation.