Cosmetic changes in WRetriever