Refactor entry listings