Code reformat
Another file needs patching