cosmetics and simplifications