Varnish esi

Cosmetic and semantic fixes.