Make cosmetic improvements to entry repository