small cosmetic and semantic changes

mostly trivial.