Simplifying metadata display code (DHH-367)