Minor code reformat for  a few files