Commen harmonization

cosmetic updates