[304] Cleaning up facet rendering code