Breadcrumbs and extensive code cleaning