Breadcrumbs code a little more concise, slightly less hacky