Tidying up the mess in SASS and the output CSS. More work to do.