some "Cosmetics" changes