Some code cosmetics and comments in variable traits