[12722] some cosmetic changes