Tidying up various partials