Clean up and small optimisation to the cov-to-dist