Minor code cleanup on breadcrumb creation