Refactoring the way we render particulars