'wict' cleanups
'wict' cosmetic changes
'wict' got more cosmetic changes