Reformat source and spelling