Reformat, add note, fix header