Minor improvements

(mostly cosmetic)