cosmetic changes, preferences more idiomatic

Vivide-mt.380